Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify 64bit path handling in cinnamon-settings #12278

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

SparkyBluefang
Copy link
Contributor

Platforms like arm64/aarch64 also use /usr/lib64, so don't restrict it to x86_64/amd64.

One additional path check is probably not worth enumerating all of the applicable machine names.

…arm64/aarch64).

One additional path check is probably not worth enumerating all of the applicable
machine names.
Comment on lines 35 to 43
# On x86 archs, iterate through multiple paths
# For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
architecture = platform.machine()
x86archs = ["i386", "i486", "i586", "i686"]
if architecture in x86archs:
for arch in x86archs:
paths += ["/usr/lib/%s" % arch]
elif architecture == "x86_64":
paths += ["/usr/lib/x86_64", "/usr/lib64"]
else:
paths += ["/usr/lib/%s" % architecture]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these paths even valid? It seems like the Ubuntu and Debian multiarch specs specially call out using the platform triplet and not just the plain machine/arch name.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant